001304
@@ -25,6 +25,7 @@
package org.jboss.as.process;
 import static org.jboss.as.process.ProcessMessages.MESSAGES;
 
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 import java.util.Locale;
 import org.wildfly.security.manager.WildFlySecurityManager;
@@ -34,13 +35,11 @@
public abstract class CommandLineArgumentUsage {
     private static String USAGE;
     private static final String NEW_LINE = String.format("%n");
 
-    private static List<List<String>> arguments = new ArrayList<List<String>>();
+    private static final List<List<String>> arguments = new ArrayList<List<String>>();
 
     protected static void addArguments( String... args){
         ArrayList<String> tempArguments = new ArrayList<String>();
-        for( String arg : args ){
-            tempArguments.add(arg);
-        }
+        Collections.addAll(tempArguments, args);
         arguments.add(tempArguments);
     }
 
@@ -96,22 +95,19 @@
public abstract class CommandLineArgumentUsage {
             width = 35;
         }
 
-        if( input.size() == 0 ){
-
-        }else{
+        if( input.size() > 0 ) {
             StringBuilder argumentsString = new StringBuilder();
             for( int i = 0; i < input.size(); ){
                 // Trim in case an argument is too large for the width. Shouldn't happen.
                 if( input.get(0).length() > width ){
                     String tooLong = input.remove(0);
-                    tooLong.substring(0, width-5);
-                    input.add("Command removed. Too long.");
+                    input.add(0, tooLong.substring(0, width-5));
                 }
 
                 if( input.size() == 1 && (argumentsString.toString().length() + input.get(0).length() <= width)){
                     argumentsString.append(input.remove(0));
                 }else if( argumentsString.toString().length() + input.get(0).length() + 2 <= width ){
-                    argumentsString.append(input.remove(0) + ", ");
+                    argumentsString.append(input.remove(0)).append(", ");
                 }else{
                    break;
                 }
